Make sure to scrape region constraints from deeply normalizing type outlives assumptions in borrowck #134940
+39
−12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…utlives assumptions in borrowck
rustbot
added
S-waiting-on-review
lcnr
reviewed
Jan 6, 2025
Comment on lines
+237
to
260
| let Ok(TypeOpOutput { | ||
| output: normalized_outlives, | ||
| constraints: constraints_normalize, | ||
| error_info: _, | ||
| }) = CustomTypeOp::new( | ||
| |ocx| { | ||
| ocx.deeply_normalize( | ||
| &ObligationCause::dummy_with_span(span), | ||
| self.param_env, | ||
| outlives, | ||
| ) | ||
| .map_err(|_: Vec<ScrubbedTraitError<'tcx>>| NoSolution) | ||
| }, | ||
| "normalize type outlives obligation", | ||
| ) | ||
| .fully_perform(self.infcx, span) | ||
| else { | ||
| self.infcx.dcx().delayed_bug(format!("could not normalize {outlives:?}")); | ||
| continue; | ||
| }; | ||
| outlives = normalized_outlives; | ||
| if let Some(c) = constraints_normalize { | ||
| constraints.push(c); | ||
| } |
There was a problem hiding this comment.
can you move this into a sub-fn
The function is already quite complex imo and this code isn't straightforward (I don't think it can be made less so, really)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Otherwise we're just randomly registering these region relations into the infcx which isn't good
r? lcnr